Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 8 Jan 2010 14:59:17 +0000 (14:59 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 8 Jan 2010 14:59:17 +0000 (14:59 +0000)

Trivial merge